Compare event->state with the default mod mask.

2001-12-13  Anders Carlsson  <andersca@gnu.org>

	* gtk/gtktreeview.c (gtk_tree_view_button_press): Compare
	event->state with the default mod mask.

diff --git a/ChangeLog b/ChangeLog
index 1ae7276d7177743f5fd2e77d0ac296c6389dfaac..036f8f9d4aed0edec0845e8aefb19a00ab7ab601 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-12-13  Anders Carlsson  <andersca@gnu.org>
+
+       * gtk/gtktreeview.c (gtk_tree_view_button_press): Compare 
+       event->state with the default mod mask. 
+
 2001-12-12  jacob berkman  <jacob@ximian.com>
 
        * gtk/gtk*.h (GTK_IS_*_CLASS): s/obj/klass/ where appropriate

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 1ae7276d7177743f5fd2e77d0ac296c6389dfaac..036f8f9d4aed0edec0845e8aefb19a00ab7ab601 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,8 @@
+2001-12-13  Anders Carlsson  <andersca@gnu.org>
+
+       * gtk/gtktreeview.c (gtk_tree_view_button_press): Compare 
+       event->state with the default mod mask. 
+
 2001-12-12  jacob berkman  <jacob@ximian.com>
 
        * gtk/gtk*.h (GTK_IS_*_CLASS): s/obj/klass/ where appropriate

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 1ae7276d7177743f5fd2e77d0ac296c6389dfaac..036f8f9d4aed0edec0845e8aefb19a00ab7ab601 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2001-12-13  Anders Carlsson  <andersca@gnu.org>
+
+       * gtk/gtktreeview.c (gtk_tree_view_button_press): Compare 
+       event->state with the default mod mask. 
+
 2001-12-12  jacob berkman  <jacob@ximian.com>
 
        * gtk/gtk*.h (GTK_IS_*_CLASS): s/obj/klass/ where appropriate

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 1ae7276d7177743f5fd2e77d0ac296c6389dfaac..036f8f9d4aed0edec0845e8aefb19a00ab7ab601 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+2001-12-13  Anders Carlsson  <andersca@gnu.org>
+
+       * gtk/gtktreeview.c (gtk_tree_view_button_press): Compare 
+       event->state with the default mod mask. 
+
 2001-12-12  jacob berkman  <jacob@ximian.com>
 
        * gtk/gtk*.h (GTK_IS_*_CLASS): s/obj/klass/ where appropriate

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 1ae7276d7177743f5fd2e77d0ac296c6389dfaac..036f8f9d4aed0edec0845e8aefb19a00ab7ab601 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+2001-12-13  Anders Carlsson  <andersca@gnu.org>
+
+       * gtk/gtktreeview.c (gtk_tree_view_button_press): Compare 
+       event->state with the default mod mask. 
+
 2001-12-12  jacob berkman  <jacob@ximian.com>
 
        * gtk/gtk*.h (GTK_IS_*_CLASS): s/obj/klass/ where appropriate

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 1ae7276d7177743f5fd2e77d0ac296c6389dfaac..036f8f9d4aed0edec0845e8aefb19a00ab7ab601 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+2001-12-13  Anders Carlsson  <andersca@gnu.org>
+
+       * gtk/gtktreeview.c (gtk_tree_view_button_press): Compare 
+       event->state with the default mod mask. 
+
 2001-12-12  jacob berkman  <jacob@ximian.com>
 
        * gtk/gtk*.h (GTK_IS_*_CLASS): s/obj/klass/ where appropriate

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 1ae7276d7177743f5fd2e77d0ac296c6389dfaac..036f8f9d4aed0edec0845e8aefb19a00ab7ab601 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2001-12-13  Anders Carlsson  <andersca@gnu.org>
+
+       * gtk/gtktreeview.c (gtk_tree_view_button_press): Compare 
+       event->state with the default mod mask. 
+
 2001-12-12  jacob berkman  <jacob@ximian.com>
 
        * gtk/gtk*.h (GTK_IS_*_CLASS): s/obj/klass/ where appropriate

diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index e34f3d93461b5f22e0c21f72e195f16edfadcf01..c813032a8ac3dca7940276d63dc7afbf2ff36257 100644 (file)
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -1756,7 +1756,7 @@ gtk_tree_view_button_press (GtkWidget      *widget,
        }
 
       if (event->type == GDK_BUTTON_PRESS &&
-         !event->state)
+         !(event->state & gtk_accelerator_get_default_mod_mask ()))
        {
          GtkCellEditable *cell_editable = NULL;
          /* FIXME: get the right flags */